diff --git a/db845c.mk b/db845c.mk
index ac760d8..1f271bc 100644
--- a/db845c.mk
+++ b/db845c.mk
@@ -1,4 +1,6 @@
 $(call inherit-product, device/linaro/dragonboard/full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/drm_hwcomposer/device.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/mesa/device.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/minigbm_msm/device.mk)
diff --git a/full.mk b/full.mk
index fd9fb18..69d8a80 100644
--- a/full.mk
+++ b/full.mk
@@ -197,6 +197,3 @@
 
 DEVICE_MANIFEST_FILE := device/linaro/dragonboard/manifest.xml
 DEVICE_MATRIX_FILE := device/linaro/dragonboard/compatibility_matrix.xml
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
diff --git a/linaro_swr.mk b/linaro_swr.mk
index fead873..5530e4f 100644
--- a/linaro_swr.mk
+++ b/linaro_swr.mk
@@ -1,4 +1,6 @@
 $(call inherit-product, device/linaro/dragonboard/full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/drm_hwcomposer/device.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/minigbm_msm/device.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/swangle/device.mk)
diff --git a/linaro_swr/BoardConfig.mk b/linaro_swr/BoardConfig.mk
index 615bf03..c57a9cc 100644
--- a/linaro_swr/BoardConfig.mk
+++ b/linaro_swr/BoardConfig.mk
@@ -6,13 +6,6 @@
 TARGET_CPU_VARIANT := kryo385
 TARGET_CPU_ABI := arm64-v8a
 
-# Secondary Arch
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv8-2a
-TARGET_2ND_CPU_VARIANT := kryo385
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-
 # Board Information
 TARGET_BOOTLOADER_BOARD_NAME := linaro_swr
 TARGET_BOARD_PLATFORM := linaro_swr
diff --git a/rb5.mk b/rb5.mk
index 50a31e8..27eab73 100644
--- a/rb5.mk
+++ b/rb5.mk
@@ -1,4 +1,6 @@
 $(call inherit-product, device/linaro/dragonboard/full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/drm_hwcomposer/device.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/mesa/device.mk)
 $(call inherit-product, device/linaro/dragonboard/shared/graphics/minigbm_msm/device.mk)